tests/mypy_types/message_dict_valid.py (1)

5-9: 🎯 Functional Correctness | 🔵 Trivial | ⚡ Quick win

Verify mypy resolves the literal-to-union assignment without ambiguity.

{"role": "user", "text": "hello"} is assigned directly to a list[MessageDict] (5-way Union[TypedDict]) annotation. Several of the union members (UserMessageDict, AssistantMessageDict, SystemMessageDict, ResultMessageDict) share an identically-typed text field, which is exactly the pattern that historically triggered mypy's "Type of TypedDict is ambiguous" error even with distinct Literal tags (mypy #8533), later addressed by a separate feature PR (#13274/#14505). Worth confirming the project's pinned mypy version actually resolves this cleanly, since a false ambiguity error here would break the "should pass" assertion in test_message_dict_mypy.py.

A more defensive fixture would avoid relying on this inference by annotating the literal with its concrete role type first:

user_only: UserMessageDict = {"role": "user", "text": "hello"}
messages: list[MessageDict] = [user_only]

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@tests/mypy_types/message_dict_valid.py` around lines 5 - 9, The mypy fixture
relies on direct inference of a dict literal into list[MessageDict], which can
still trigger ambiguous TypedDict union resolution in some versions. Update the
test in message_dict_valid.py to avoid depending on that inference by first
binding the literal to the concrete UserMessageDict type, then building the list
from that value; keep the rest of the narrowing check with msg, narrowed, and
get("slug") unchanged so the test still verifies the intended path.

utils/jsonl_parser.py (1)

59-130: 📐 Maintainability & Code Quality | 🔵 Trivial | 💤 Low value

Reduce duplication in per-role fallback construction.

Each role branch repeats base["uuid"], base["parent_uuid"], base["timestamp"], base["is_sidechain"] verbatim. Since every role-specific dict is a subtype of BaseMessageDict, spreading base would remove the repetition.

♻️ Proposed refactor using `**base` spread

     base = _fallback_common_fields(entry)
     if role == "user":
-        user_msg: UserMessageDict = {
-            "role": "user",
-            "uuid": base["uuid"],
-            "parent_uuid": base["parent_uuid"],
-            "timestamp": base["timestamp"],
-            "is_sidechain": base["is_sidechain"],
-            "text": text,
-        }
+        user_msg: UserMessageDict = {**base, "role": "user", "text": text}
         return user_msg

Apply similarly for the assistant, system, progress, and result branches.

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@utils/jsonl_parser.py` around lines 59 - 130, The per-role fallback builders
in _fallback_message repeat the same BaseMessageDict fields in every branch.
Refactor the user, assistant, system, progress, and result dict construction to
reuse the common values from _fallback_common_fields via unpacking instead of
spelling out uuid, parent_uuid, timestamp, and is_sidechain repeatedly. Keep the
role-specific fields unchanged while simplifying the branch bodies.

utils/search_index.py (1)

372-401: 📐 Maintainability & Code Quality | 🔵 Trivial | 💤 Low value

content local is now always empty — dead parameter.

content is initialized at Line 376 and never reassigned in any role branch (system/result already inline the content fallback into text at Lines 388-392). The content=content argument at Line 398 is therefore always "", making the parameter and variable vestigial.

♻️ Suggested cleanup

     role = msg["role"]
     text = ""
-    content = ""
     tool_result: object = None
     progress_data: object = None
@@
     return combine_searchable_text(
         text=text,
-        content=content,
         tool_result=tool_result,
         progress_data=progress_data,
     )

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@utils/search_index.py` around lines 372 - 401, `message_searchable_text` has
a dead `content` local that is never populated, so remove the unused variable
and stop passing it to `combine_searchable_text`. Keep the role-specific text
extraction logic in `message_searchable_text` intact, and update the
`combine_searchable_text` call to rely only on the meaningful fields (`text`,
`tool_result`, `progress_data`) so the function reflects the actual data flow.

tests/test_message_dict_mypy.py (1)

19-35: 🩺 Stability & Availability | 🔵 Trivial | ⚡ Quick win

Isolate mypy's cache directory to avoid repo pollution/races.

Without --cache-dir, mypy writes .mypy_cache under REPO_ROOT (the cwd) on every parametrized invocation. This pollutes the working tree and can race with parallel test execution (e.g. pytest-xdist) or a developer's own mypy cache, causing flaky results.

♻️ Suggested fix: use an isolated temp cache dir per invocation

+import tempfile
+
 def _run_mypy_on(path: Path) -> subprocess.CompletedProcess[str]:
-    return subprocess.run(
-        [
-            sys.executable,
-            "-m",
-            "mypy",
-            "--strict",
-            str(path),
-            "--config-file",
-            str(REPO_ROOT / "pyproject.toml"),
-        ],
-        cwd=REPO_ROOT,
-        capture_output=True,
-        text=True,
-        check=False,
-        timeout=60.0,
-    )
+    with tempfile.TemporaryDirectory() as cache_dir:
+        return subprocess.run(
+            [
+                sys.executable,
+                "-m",
+                "mypy",
+                "--strict",
+                str(path),
+                "--config-file",
+                str(REPO_ROOT / "pyproject.toml"),
+                "--cache-dir",
+                cache_dir,
+            ],
+            cwd=REPO_ROOT,
+            capture_output=True,
+            text=True,
+            check=False,
+            timeout=60.0,
+        )

Note: the static analysis "OS command injection" flag on this block is a false positive — path comes from MYPY_TYPES_DIR / fixture_name, a fixed internal test path, not external input.

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@tests/test_message_dict_mypy.py` around lines 19 - 35, The `_run_mypy_on`
helper is letting mypy use the default `.mypy_cache` under `REPO_ROOT`, which
can pollute the repo and cause races in parallel runs. Update the
`subprocess.run` invocation in `_run_mypy_on` to pass an isolated temporary
cache directory for each call, so every `mypy` execution uses its own cache and
does not share state with other tests or developer runs.